问题修复

See merge request !28

(cherry picked from commit 761bb895)

1538ca7b 问题修复

修复问题

See merge request !25

(cherry picked from commit 30e7cfa4)

8849fbe9 修复问题