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