Merge "Fix small typo in comment"