Merge pull request #1660 from antonio-nino-diaz-arm/an/misra

Several MISRA defect fixes