Merge "Initialize p2p settings"