[DCP-o-matic] Merging test versions into stable