Ticket #24017 - Addressing code review feedback.