Merge "Add sub-elements for "Variant" type" into qt-dev