[SIRO-1827]

[SIRO-1827]