Fix bug 1691 - adding support for persistent volumes