Merge "Fixing inaccurate physnet mapping iterations"