Merge remote-tracking branch 'origin/v3.004-dev-cpp' into v3.008-dev-new

Merge remote-tracking branch 'origin/v3.004-dev-cpp' into v3.008-dev-new #3589