Merge "Support all phenotype flag types (1/2)" into nyc-dev