Merge "fix(xilinx): resolve misra rule 8.4 violations" into integration