Merging v3.10-rc2 as I need to apply a fix for