WIP:BUG###-nizhouting #150

Draft
nizhouting wants to merge 3 commits from nizhouting/EnglishPal:BUG###-nizhouting into Alpha-snapshot20230621OK

3 Commits (master)