[FIX] missing conditions

Merged Uriel Mayo requested to merge Hotfix into 12.0-stage

Merge request reports