Merge main into HD fork