Merge version_7 into main #6

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