#19171  Code Review changes