Merge pull request from GHSA-jjh3-2vqh-ccjp