Merge pull request #3906 from anandpdoshi/item-variant-fixes

Fixes to Item Variant Attribute