Automatic merge from submit-queue (batch tested with PRs 49055, 49128, 49132, 49134, 49110) add a union category expander Adds a union category expander for use when we need to combined hardcoded and non-hardcoded options.