From 1b5428b2b7e76899dbb7315dfb636994e6d39aa5 Mon Sep 17 00:00:00 2001
From: Damian Nolan <damiannolan@gmail.com>
Date: Thu, 25 May 2023 14:11:03 +0200
Subject: [PATCH] Merge pull request from GHSA-3v7p-4x7p-4rx7