Spoi 3231-pull

Please review changes for jira SPOI-3231