PIM-2694

Behat scenarios passed (builds 990 and 52)