Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maint