Merge "FM: Fix KW issues found in FM" into fm.lnx.2.0.4-rel