FIX: closes COOK-3966