Merge pull request #16541 from niranc/patch-2