Merge branch 'config-local' into dt-test