Merge "Move log to the server side" into main