Merge "Missed adding $patchset in two places"