#19775 Feedback from code review