Merge "BUG-509: Move ModificationApplyOperation"