fixed localStorage security error
Merge branch 'hotfix/local-storage-security-error'