Merge pull request #1169 from antonio-nino-diaz-arm/an/spm-fixes

SPM fixes