Merge "Fix broken test RecoverySnapshotStorageTest" into pi-dev