Inital set of forward ported patches from essex-hack-suse