Changed cucumber environment load order
Manually merged support changes