Merge stable into main. #3389

Rowlando13 merged 2 commits intomainpallets/click:mainfrom

stablepallets/click:stableCopy head branch name to clipboard