Cherry pick changes into V4.2.2rc

added changes into v4.2.2rc