LOADUI-123
Merge branch 'sprint12' of github.com:SmartBear/loadui into sprint12