Feature/hardening

solves COOK-3697