Patch for ABCL development versions