Sync commit. Added buggy Tmsg.Walk handling