Merge #10297: Simplify DisconnectBlock arguments/return value