[SIRO-1809]

[SIRO-1809]