Remove guest prefix in more places (there should really be a better way)
Merge remote-tracking branch 'origin/dev/temp' into dev/temp