Merge version_3 into main #6

Open
bender wants to merge 13 commits from version_3 into main

13 Commits