fix issue that stores unsafe.pointer in uintptr
Merge branch 'develop'