Merge some more changes to variant that accidentaly were not merged in r86650 

[SVN r86676]