Fix error in UniqueVariantAxisValidator
Merge branch 'master' into PIM-1435