Merge #698: Event after fire initial rebased (fixes #689)