Merge remote-tracking branch 'oe21/master' into vuplus-3.0