Merge pull request #1473 from robertovargas-arm/misra

Misra