Changes for 3.3 version
Merge branch '3.3/master'