Bugfix preventing variables to be potentially unbound if flexibility tax is switched off

Jerome Hilairerequested to merge
github/fork/merfort/develop into develop

Created by: merfort

Merge request reports