#22237: fix patch attribution.
#22237: merge patch attribution fix.