Merge "Improve logging / status"