Merge "Add flag for client-side protologging" into main