Fec 1894 - Fix CORS issue and add notification event