Merged main branch changes. hook_schema removed.