Fix DEVKIT-646