Move raw_options endif statement
Merge branch 'hotfix/fix-raw-genotypes'