QA-169
increase timeout
Merge remote-tracking branch 'origin/master'