merge in lmp-preview-dev history after reset to 8eee38bd4151448e67a1aff3d7c8d9214df6de83