The original fix is provided by Sergey Shelukhin, the UT is added by Duo Zhang Amending-Author: Duo Zhang <zhangduo@apache.org> Signed-off-by: Duo Zhang <zhangduo@apache.org>