integrate invitation and enrollment work into rebased branch