[SIRO-1685]

[SIRO-1685]