small change after code review
Merge branch 'bugid-98239' into dev