[SIRO-1603]

[SIRO-1603]