[discord/f33: 7/9] Merge branch 'f33'