Merge "Fix missing network id arguments" into main