[SIRO-1843]

[SIRO-1843]