Re-sync master with latest from develop

assigned to @mhoebeke

added 4 commits

• f3a394f1...62ad717e - 3 commits from branch main
• ae57b58f - Merge branch 'main' into 'develop'

Compare with previous version

mentioned in commit 61697dac

merged