Merge "fconf: Fix misra issues" into integration