Dev/issue 6596 aip restore v3

`is None` here too