Merge "Add derive macros to KeyDescriptor"