Merge pull request #20212 from jitendrapurohit/dev-2583-537