Merge "Drop fixed_network dependency from CONF"