Merge branch 'da/user-useconfigonly'