[SIRO-1917]

[SIRO-1917]