BUG 9933 Step conditions evaluating too early IMPROVEMENT
Merge pull request #1611 from julceslauhub/master

BUG 9933 Step conditions evaluating too early IMPROVEMENT