Merge main into dev after 1.5.1 release#592

j-chmielewski merged 2 commits intodevDefGuard/client:devfrom

main-1.5.1-mergerDefGuard/client:main-1.5.1-mergerCopy head branch name to clipboard