Merge branch 'save-config' into dt-test