v2.3.8 hot fix rel1