From dc6615f98ff334add61c099a48f0f90533beec9c Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Tue, 1 Mar 2022 11:11:39 -0500
Subject: [PATCH] Cherry Pick commits from master to release/5.4 (#4943)