Fixed CS
Fix behat test
Merge branch 'master' into PIM-1929