Merge "Update signature files to the new format"