Merge "Add check for floating_network_name"