Merge branch 't/configure_fix'