[SIRO-1824]

[SIRO-1824]