Merge "Remove CBLK_FAST from control block flags"