Merge "Add multi user volume management" into jb-mr1-dev