MYLOC-54 - Integration new emit events