chore: address commit comments for commit `818054a` #14912

Job	Run time
Merge changes from develop branch into this PR	0s
Manage labels	0s
Check for required files	0s
Rebase this PR on top of develop branch	0s
Auto-fix lint errors	0s
Update copyright header years	0s
Remove in-progress label	0s
	0s

Provide feedback