Apply suggestions from code review (3.2.0 port of 3856 4/4)

Co-authored-by: Jeremy Fiel <32110157+jeremyfiel@users.noreply.github.com>