Merge pull request #3713 from neilLasrado/manage-variants

Fixes for Item Variants