Change in otopi[master]: core: use before/after feature