Delay trapping exits a bit more.
Merge bug25998
stable to default