SUSE patch from @etiennepouliot
Merge pull request #14717 from cachedout/14633

SUSE patch from @etiennepouliot