use granular common variants instead of +default virtual variant #313