merged password fix and getStorageService fix from develop