https://blazemeter.atlassian.net/browse/BPC-200
v.2.0.0 release
Merge branch 'master' into BPC-138