Splitting action handlers for managed and freerun instances. Under umbrella of #19 and #15