Bug fixies:
https://blazemeter.atlassian.net/browse/BPC-128
https://blazemeter.atlassian.net/browse/BPC-130