Is it possible to merge this patch?