Variants defined

Define some variants.
Merge remote-tracking branch 'origin/master'