merge in lmp-mr1-release history after reset to 6e1f41253728e6870de800f88b5aa2cfde60ee8b