Dev/issue 6596 aip restore v3

Include a message here?