Merge "Fix false-positive matching of notification to FGS" into sc-dev