Pulling in fix for Cook-3807