Merge pull request #7604 from rohankatkar/17815