Long overdue sync with current codebase