Merge branch 'jc/conf-var-doc'