Merge pull request #1207 from zmeihui/24-8-17-dev