COOK-3900: v2 with Apache 2.4 support