Merge pull request #7718 from joelucid/40defaults