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