Merge "Normalize logging of userId for easier grepping" into main