Update to Kiwi 2.0.6