Same commit as on the bc repo