Issue rebase from F42 to F41 - Bazzite