CDB-2891 Unqualification of Vis + bugfix