Merge "Extract top level directory for public volumes" into rvc-dev