Fix DEVKIT-681