Fix DEVKIT-1205,DEVKIT-1203