Merge latest changes of dev into main. Closes #89 (closed) , #98 (closed) , #64 (closed) , #93 (closed)