Signed-off-by: Max Peng <pengisgood@gmail.com>
(cherry picked from commit 88d33fe)