[DO_NOT_MERGE] oo-admin-repair, oo-admin-chk refactor