[Update] Kiwi (2.2.4)
Merge pull request #9179 from modocache/kiwi-2-2-4

[Update] Kiwi (2.2.4)