From 3d623adcc2ce1ade7514ffa3ce64099b4f0c315e Mon Sep 17 00:00:00 2001
From: Sam Batschelet <sbatsche@redhat.com>
Date: Sun, 21 Nov 2021 14:45:15 -0500
Subject: [PATCH] Merge pull request #13477 from mitake/backport-13308-to-3.5

Backport PR 13308 to release-3.5