#19171 Missing Code Review changes