Scope bugfix for VOL-71.
Merge pull request #208 from GinkgoFJG/4.4-1.x-VOL-71

Scope bugfix for VOL-71.