Merge release-3.6.1 back into main#1458

sean-breen merged 2 commits intomainnginx/agent:mainfrom

release-3.6.1nginx/agent:release-3.6.1Copy head branch name to clipboard