merge LX changes