merge in lmp-mr1-release history after reset to 06b23bb5cbddfed587a6f0d75636734862b49a1e