Merge "Remote volume handling" into jb-dev