Merge "Minor changes in the topology extraction for GNPy"