Add missing setting in default creation script.
Merge remote-tracking branch 'origin/develop' into develop