WIP: IMPROVE+BUGFIX #38

Draft
liuchangyou wants to merge 3 commits from Bug209-LiuChangYou into Alpha-snapshot20240618

3 Commits (master)