[SIRO-1602]

[SIRO-1602]