Merge "Hotfix bug 1556 - FRM: NPE thrown in notification"