Ticket #25711 - Address code review feedback.