merge in lmp-mr1-release history after reset to 3d48bc23465becc6992756d4160550bf01799ffc