Merge "Override phenotype flags during tests" into rvc-dev