Merge pull request #15314 from jitendrapurohit/dev-1255