Merge pull request #6786 from nupplaphil/issue/6758-console_storage