Merge remote-tracking branch 'origin/trunk' into g3