CB-4465: Supporting 2.9.x for a period of time