Feature/689 event after fire initial rebased

continued from #690