Dev/issue 6596 aip restore v3

(Raise if there's more or less than one recovery location in the space, that is.)