* add type and default values * remove unnecessary string operation
Resolve #7779
This reverts commit 06e817af.