Merge "Improve logging in bootstat."