resolve merge conflict from 283a59a
Merge branch 'COOK-2422'