remove SYS_GUID, it's security.
bug fixed for WallFilter
Merge remote-tracking branch 'upstream/master'