partial merge of JanetUI and develop