Merge "Keep config file as argument to support p2p"