This was fixed within master, we need to backport changes to supported releases that would still be affected.
This was fixed within master, we need to backport changes to supported releases that would still be affected.