Closes #11259 Signed-off-by: Matt Farina <matt.farina@suse.com> (cherry picked from commit 7cbec356b4)
7cbec356b4