[DSVR-1718]

[DSVR-1718]