More Guid updates
Merge remote-tracking branch 'origin/GuidRefactoring'