Merge version_6 into main #7

Open
development wants to merge 2 commits from version_6 into main
Showing only changes of commit 13f2bc4b58 - Show all commits