[SIRO-1717]

[SIRO-1717]