[SIRO-1920]

[SIRO-1920]