Merge pull request #960 from paul-elliott-arm/merge-into-3.2.1

Merge 3.2.1 into development