Merge "FM: Fix static analysis issue" into fm.lnx.2.1.c3-dev