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