Merge "Make attach_volume use **kwargs"