Merge "fix(misra): fix MISRA defects" into integration