Merge "Allow specifying --end-usage by enum name"