Commit 1/2: add patches for security advisory.