Merge fixes and improvements from feature/specta
Kiwi version updated.