better guest data cleanup
Merge remote-tracking branch 'upstream/development' into development