Re: [master] Fix the mess I made of storage checking