Merge "Moved setNeutronNetworkId() call inside null check to prevent crash at outputs...