[SIRO-1821]

[SIRO-1821]