Fix DEVKIT-468
fix DEVKIT-448