https://blazemeter.atlassian.net/browse/BPC-229
Merge branch 'develop' into refactor