Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'