Fix behat scenario
Merge branch 'master' into PIM-2554