Move manual events into tech controller

Rebased #1415 against stable.