RPV-306 - Changes to sex so it gets displayed properly
Merge remote-tracking branch 'origin/develop' into develop