Apparent partial commit of bw-classic