Fix regressions introduced by code cleaning

TRANIER John requested to merge dev into master

Merge request reports