Merge "Fix CopyService after recent refactoring."