Merge pull request #16644 from seamuslee001/extension_notices