[DLDSS-504]

[DLDSS-504]