[SIRO-1818]

[SIRO-1818]