Diff implementation appears to be working smoothly and correctly in my tests so far. Still disabled for now, but may turn switch soon.