merge in lmp-mr1-release history after reset to 4a542d96a9ce1fc8b567eb853dac0baea64505a1