Code

Merge branch 'sb/maint-1.6.0-add-config-fix'