More debug-bf_2d final for 6.11