Merge pull request #1383 from davvid/ruff