bring inline with 4.1.2_r1.2