Merge "FM: Fix KW issues." into fm.lnx.2.9.1