Merge branch 'vuplus_experimental1' into vuplus_experimental