#19775 Further code review feedback