DEVKIT-733 Fixed