FS-4779 I don't have this labbed up to try so can you try this patch and repost logs if it doesn't work