Merge "BUG-2876: switch to using the computed ModificationType"