Forward-port patches from SUSE