Fixed COOK-2935
Merge branch 'COOK-2935'

* COOK-2935:
  Fixed COOK-2935