Fix a duplicate restore items problem.
Merge remote-tracking branch 'sandbox/sprint4' into sprint4