Storage move

Delivery #430773 cancelled