Merge version_3 into main #3

Open
development wants to merge 2 commits from version_3 into main
Showing only changes of commit 1edf2bc6a9 - Show all commits