Merge "Filter out duplicate autoblocks when checking for blocks"