Merge main updates