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

* commit 'c89eeaab4d5322658eea4e947b38ad953cacf1fa':
  Fix volume handling for fixed volume routes.