changes on PR feedback

Bug #76243