(cherry picked from commit 4e5df76b86e4f70053f2a73c9ea0f457d88774cc)
Signed-off-by: Yikun Jiang <yikunkero@gmail.com>