Ref #3332: Catch disable PI case, clear logs in deployment
Merge pull request #139 from VinceMacBuche/bug_3332/correct_use_of_parametrized_variables

Ref #3332: Catch disable PI case, clear logs in deployment