[COOK-2421] - commit 20a9dd3b has other changes