only create default config when attribute is set
Merge branch 'optionalDefaultConfig' into cherrypicks