Issue #3224239 by bircher, rpayanm, smustgrave: StorageComparer does not work when storages are not in the default collection (cherry picked from commit c48da9e7)