Merge "Add -i node_key" into cord-1.0