Merge remote-tracking branch 'origin/3.3.x' into 4.0.x

Merge remote-tracking branch 'origin/3.3.x' into 4.0.x #170