Merge pull request #38157 from blaggacao/fix/notification-comply-with-upstream