merge update #7174

kristentr wants to merge 2 commits intogithub:maingithub/advisory-database:mainfrom

kristentr:mainkristentr/advisory-database:mainCopy head branch name to clipboard