Patch to VOL-59

Merge these in to your forked branch; this will update the PR to the main repo. Then I'll merge in the whole patch.