[DSVR-1895]

[DSVR-1895]