v6.1.2-20221125
096bdfcc · executor: cherry-pick 4a91a24b (#39383) ·