Closes #2624 Signed-off-by: Duo Zhang <zhangduo@apache.org>
closes #2246 Signed-off-by: Duo Zhang <zhangduo@apache.org>