(#19514) Squash! Adds more comments marked #19514