[SIRO-1601]

[SIRO-1601]