Even after MBS-7382 is merged, it will still be possible to set a gender for choirs and orchestras by overriding the JavaScript.

The database constraint group_type_implies_null_gender needs to be extended to choirs and orchestras, and the entity merge in MusicBrainz::Server::Data::Artist as well as the validation in MusicBrainz::Server::Form::Artist must be adapted to take all three group types into account.