[SIRO-1619]

[SIRO-1619]