Merge pull request #959 from paul-elliott-arm/merge-into-3.2.0

Merge 3.2.0 into development