Merge branch 'improve-conf'