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