v6.5.2-20230519-5239c23
5239c23a · executor: revert #42285 and #42503 (#44000) ·