Moving new extraction logic into the SourceEventMapper.
Merge remote-tracking branch 'origin/master'