Rebase before refactoring setDefaults.php