Exploit Base polymorphism fully for <bool>
TH: New take on the options fix, can you test and merge if good? Tag master tip as 1908.0 after merging.
TH: New take on the options fix, can you test and merge if good? Tag master tip as 1908.0 after merging.