Running server in component tests
Merge origin/master
Running server in component tests