Merge branch 'ds/autoconf'