Add D10 support to 8.x-1.x