merge in lmp-preview-dev history after reset to a77a80167b9acf91dfcd6c13fb76c0be2718030a