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