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