Merge "Use 'attach_volume' method"