Merge in removal of setting infinite no_block