merge in lmp-mr1-release history after reset to 7fcc4e2e1ce52d058724fbecf5fe6bc02251c587