Merge 22yo validation bug fix into staging

https://osraav.atlassian.net/browse/OSRA-194