For upstream

The new plugin is probably not useful for 1.23, but the multiterm fix might be.