Merge 1.10 back into devel