workaround for static type checking problem
Merge branch '2.3.x' into 2.4.x