Migrated to Dominator >=12.1