Merge pull request #1287 from davidcunado-arm/dc/fix_misra