Merge pull request #16773 from UshaMakoa/patch-7