Merge remote-tracking branch 'sstabellini/saverestore-8' into staging