[PDT-5578] More executor work