Merge branch 'fk/autoconf'