[DLDSS-508]

[DLDSS-508]