MYIPHONE-208 Update to cad client 3.3.2 and fix some other issues found as a result