Merge remote-tracking branch 'origin/refactoring' into refactoring
Removed phpunit and behat execution for now.