Merge "Fix memory explosion in multi-store image tests"