Merge "Improve logging of child commands." into nyc-dev