Merge pull request #20773 from alifrumin/rn5.39