* Add Server Sent Events API endpoint * Support both event handlers as a transitory measure * Fix merge conflicts