merge in lmp-mr1-release history after reset to 0cc59dd303205de7110e298e9b90b1c3b98f4711