Merge "BUG-2876: determine ModificationType while applying changes"