Add defaults feature from #9768  

Wanted to use this feature without upgrading.  Not the full patch from #9768 but the required functions are there.