Merge "Fix fixed_network bug 1439634"