JSS -> JWR patch