MDL-37974 code area: manual enrolment expiration fix more merge conflicts