[COOK-3778] Fix customizations from COOK-3287