Bring inline with 4.2.1_r1.2