Merged LP2

Local changes from Gosho-Pesho