Fix recursion error events models Closes #1018 and #1015 See merge request !1511 (cherry picked from commit 33e8344d) 14282949 Fix recursion error events models