Merge "BUG-4117: add support for flow old Notif"