Merge pull request #17635 from seamuslee001/5262_notes