Fixed #22537 -- Add tests and improved docs for field subclass with choices.