[PDI-9989] stash final