Resolve #3382867 "Variables fixes"

Closes #3382867

Merge request reports