Hard reset to upstream/3.3.5
Merge remote-tracking branch 'origin/3.3.5' into 3.3.5