COOK-2799 Improvements after review