Merge "Improve logging of vm's console output"