Merge branch 'jn/conf'