[SIRO-1812]

[SIRO-1812]