Merge "Add declare_binder_enum! macro"