am 066fadb9: Merge "More volume UUID awareness."

* commit '066fadb983b117a7682af00780d23d16232ab0e2':
  More volume UUID awareness.