Signed-off-by: Shengqi Chen <harry-chen@outlook.com> (cherry picked from commit 965765aef9)
965765aef9