Merge version_7 into main #7

Open
development wants to merge 9 commits from version_7 into main
Showing only changes of commit 269c4e66ec - Show all commits