Merge "SF: Remove a redundant word from comment." into main