Merge "Fix typos found by linter" into main