[GAIA BUG969393] - Different device storage used