merge in lmp-mr1-release history after reset to 481681a1d37ea51a6b1ee53600efeb5013666c58