Merge "Revert "Fix master/pool logic of network states""