[Issue 8125] MMR throws away valid changes causing drift