Merge "Don't log when there are no more messages" into main