Merge remote-tracking branch 'origin/fix-78' into prefersDarkTheme