Hotfix for cherrypicking_volume.
Hotfix for cherrypicking_volume.
Merge pull request #62 from benoitmangili/hotfix_cherrypick

Hotfix cherrypick