merge in lmp-mr1-release history after reset to 8fb68b60d25d59ad2b1c62a32bc7772caabd94a7