MDL-22148 backup - support for manual/self/guest enrolments. Credit goes to Petr.