new version 3.3.2
Switch code line
Fix ticket 0000877
Merge branch 'hotfix-3.3.2' into develop