- 460869 - 25/01/2022 - Fix Generic events not created properly