Merge "Fix volume handling for fixed volume routes." into jb-mr2-ub-dev