Change in otopi[master]: Use before/after in STAGE_BOOT