Merge branch 'nd/complete-config-vars'