Merge "Remove custom copy rules, stop using ACP"