Fix DEVKIT-933