Merge "Replace custom rules, remove ACP"