[SIRO-1654]

[SIRO-1654]