Fix DEVKIT-652