Integrate changes for 2.4.1.3 from OS