Merge pull request #17840 from seamuslee001/5272_rns