Fix DEVKIT-991