[9136] Merge branch '330' - Switch to support client version 3.3.0A