fixes for cn1, PAM
Merge branch 'master' into ZD-2537
upgrading to 3.5.4