Background fix rebased on latest upstream

Is this how it's done?