Merge "Fix of issue 377 for Notifications resolving."