Pull again from dev branch as the scenario test fixes i added changes this a little bit.