Merge "Handle fixed_network edge cases gracefully"