Merge "Test alignment between topology and portmapping" into nitrogen