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