Fix localStorage timeout
Merge