[DSVR-1817]

[DSVR-1817]