Merge version_7 into main #7

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