Merge "Fix common typo" into main