#all patches applied upstream
