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