Resolves: #2069150 Original Fedora upstream commit: deb21bb3fe I've skipped parts of the commit that are not relevant to this change
deb21bb3fe