Merge remote branch 'origin/acid-burn/networking_changes'