Merge remote-tracking branch 'origin/3.5-dev' into 3.6-dev