Merge pull request #16101 from jitendrapurohit/dev-1474