SPOI-3231-pull

Pull request for Jira:SPOI-3231