Patches by Carlos Rodriguez-Fernandez <carlosrodrifernandez@gmail.com> from Fedora Resolves: RHEL-31988 Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
