Merge remote branch 'origin/acid-burn/network_changes_next' into experimental