Fixes latest build on travis : master
Merge branch 'cs/#7078-cs-travis-failure-fixes'

Close #7078