Merge branch 'ds/config-internal-whitespace-fix'