Merge "Add support for custom app and uri in events"