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