merge in lmp-mr1-release history after reset to 1b6f4f41619f8727d02e2702b1cbe562d14243be