Fix missing variable (dev_5_0)

Subset of #2205 - missing imports don't apply to dev_5_0