Issue #137: cherry-pick fix
Merge remote-tracking branch 'origin/3.3.x'