Merge branch 'main' into bugfix/issue859