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