Imported LM2.1.6 and OVR0.4.3.1