Merge with 3.10.5