Merge "Improve Shard logging output"