merge in lmp-preview-dev history after reset to 2dc33605704d570ebd2ab5f0428ea94672ce6a7e