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