Merge branch 'fix-recursion-error' into 'master'
Fix recursion error events models Closes #1018 and #1015 See merge request !1511
Fix recursion error events models Closes #1018 and #1015 See merge request !1511
mentioned in commit 9e91156e
·mentioned in commit 9e91156e