#16554 bfc68