merge in lmp-mr1-release history after reset to 07a6a70e1f7b63ad80cf2f931a2618b0e40f403a