Merge branch '1.10' into main