Merge nnarct/dev into main to sync with private branch refactor/canvas#1

nnarct wants to merge 11 commits intomainnnarct/OsseoLab:mainfrom

nnarct/devnnarct/OsseoLab:nnarct/devCopy head branch name to clipboard