NSPS-658 - Full Save the Last