Fix Jenkins build (hopefully)
Merge branch 'fix_jenkins' into dev