https://blazemeter.atlassian.net/browse/BPC-194
https://blazemeter.atlassian.net/browse/BPC-198
https://blazemeter.atlassian.net/browse/BPC-198
https://blazemeter.atlassian.net/browse/BPC-198
Merge branch 'develop' into BPC-138