Merge dev-1.1 into main. #11

Closed
LukeGus wants to merge 71 commits from main into dev-1.1