Merge branch 'tool-config-auto-update' into disallow-implicit-dependencies