[PDT-5578] Even more executor work