Merge branch 'cucumber_tests'