19736

Code review for 19837 & 19838