Fix DEVKIT-794