Updated with information related to dealing with the Kiwi submodule.