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