[SIRO-1604]

[SIRO-1604]