Merge "Update volume and volume transfer schema"