Merge pull request #1228 from votjakovr/develop

potentially fix integration test