blackbox/whitebox separation has been merged into 2.11

/cc @eed3si9n