Merge pull request #16036 from agh1/5.21.0-releasenotes