Merge stable into dev to resolve CLA workflow conflict#3016

aconite33 merged 12 commits intodevblacklanternsecurity/bbot:devfrom

merge-stable-into-devblacklanternsecurity/bbot:merge-stable-into-devCopy head branch name to clipboard