Merge "Stop logging service name hash" into main