Merge pull request #21818 from alifrumin/rn5.43