Merge commit 'origin/vuplus-1.6' into vuplus-1.6