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