Fixing Jenkins because of a nasty bug on US508
Merge branch 'fix' into development