Allow providing the defaults dictionary to override.
Merge pull request #3333 from s0undt3ch/develop

Allow providing the defaults dictionary to override.