Merge "CBLK_OVERRUN, not CBLK_UNDERRUN, is for record threads"