Develop kickstart

merge