merge in lmp-mr1-release history after reset to 38883df9fc8fc1c488d5b53828c6bd3dfe2ddbb8