Merge commit 'origin/bug_609_packetmanager_fixes' into experimental