Merge "Add support to make identity files from the command line."