Merge remote branch 'remotes/origin/bug_609_packetmanager_fixes'