[GAIA BUG969393] - Different device storage used
Merge pull request #282 from michalbe/Bug969393-temp

[GAIA BUG969393] - Different device storage used