Merge "Improve logging and shutdown executor properly"