accomodate for broken localStorge
Merge remote-tracking branch 'gh/develop' into develop
'develop' fixed now?