Merge main changes