Merge "Modify PreNetworkConfig config inline with role-specific parameters"