Signed-off-by: Hidde Beydals <hidde@hhh.computer>
(cherry picked from commit 4b0cda68)