WIP: v1.2.8 Pull #1

Draft
voidf1sh wants to merge 7 commits from dev into main

7 Commits