Merge branch 'variant_refactor'