Merge version_6 into main #6

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