Merge pull request #2395 from wpaulino/phantom-deduped-forward-event