Fix DEVKIT-1201,DEVKIT-1202