refactoring & use git.event - refs #4828