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