[SIRO-1811]

[SIRO-1811]