fix type declaration
Merge branch '2.3.x'