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