Merge #9014: Fix block-connection performance regression