added localStorage check
Merge branch 'i25086'