Merge version_7 into main #7

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