Merge "[OOM-CMPv2] Refactor merger/copier CSIT"