Add support for volume scopes Upstream-commit: 28dde09cdf2a48dcdb6ce665cd2b912175dfb871 Component: engine