fix: A bundle of fixes in no particular order#986

OH296 merged 3 commits into

Adeptus-Dominus:mainAdeptus-Dominus/ChapterMaster:mainfrom

OH296:finish_portingOH296/ChapterMaster:finish_portingCopy head branch name to clipboard