merge in lmp-mr1-release history after reset to 5f882f5d3cb3f42276350ed3c29bb564f6cff89d