[PATCH 4/7] Fix initialization of Storage.roots to use a list. (#884270)