merge lg2 to master