Merge "Ensure volume is deleted after build error"