Support for Kiwi 2.3.0.