Merge "Added flow event listener"