Merge hostit into develop