- Related: rhbz#1949159
Rebased to upstream candidate. - Resolves: rhbz#1955374
Related: rhbz#1955374