Merge unified builtins branch