New engine job:wait

This depends on #2781. Please review that first.