Fix DEVKIT-790