Merge pull request #20468 from alifrumin/rn5.38