Cook 3084

COOK-3084 changes.