Re: [f18-branch/master] Fix for some storage-related translation issues