Merge "coverity: fix MISRA violations" into integration