Merge branch 'fix/moderation-log-crash' into 'develop'