Merge branches 'main' and 'main' of github.com:tw93/weekly

Merge branches 'main' and 'main' of github.com:tw93/weekly #1613