[COOK-3072]

Fixes issue - COOK-3072

This also contains the fixes for 
* COOK-3063
* COOK-3064
* COOK-3065
* COOK-3067