Merge "Fixed userId not updated when user changed" into main