better defaults for sd
Merge branch 'hotfix/1.6.1'