am 2f442304: Merge "Remote volume handling" into jb-dev

* commit '2f4423043ffeaf232ec984be03743326f08cdc8a':
  Remote volume handling