psiinon Merge pull request #7259 from zaproxy/kingthorin-patch-1