merge in lmp-mr1-release history after reset to a0d0ad3f4fd21ba0f54021b74337142a6ec45f3e