Merge "CCBC: Fix null pointer exception at CCBC::flush()"