MT#8633 Properly set is_primary on sub creation