Merge main 3.0.68 patch