Merge "Add logger to the server"