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