https://blazemeter.atlassian.net/browse/BPC-221 fix
Merge branch 'develop' into refactoring