Merge pull request #15346 from jitendrapurohit/dev-1272