Merge "fm: Fix for NULL pointer exception" into fm.lnx.2.1.c3-dev