Merge from init-server.el to config/builtins.el