#all patches merged upstream
