Merging genotype-specific evaluation code and changes on genotype branch into master