merge in lmp-mr1-release history after reset to 3dbcc8b9332cdbaa0dae47a6cae3a043f96262fe