SSP-874 - Apply similar override logic to gender