Yg/issue1353 enrollments (#1365)