Merge remote branch 'origin/v3-6-test' into v3-6-stable