merge in lmp-mr1-release history after reset to 233fe7bc98b5b546fe551b2d22213e3b910885bb