sync slp.patch with upstream