Merge "Overlap volume and server creation in backup"