Merge "Fix a typo in userId" into main