JOJ2: If storage is null it is set to 0
Merge remote-tracking branch 'origin/master'