[SIRO-1605]

[SIRO-1605]