Merge branch 'tb/config-default'