MT#4143 backport for 3.3
Bump version 3.3.5-2