partial merge of multi CI support