Merge Code to Lar 4.2