Gemma Guest

Apparently this was working in v5.0 so must have been introduced in v5.1

I think I have a fix for this but I am not convinced it is safe to put into this release so pushing back to the next milestone

We might want to look at this along with #34000