CDB-2891 Fully qualify party step 1