merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c