RF-13478: Fixed the vdl issues