fix #3534: NullPointerException in getInternalStorageBase
Merge branch 'release' into upstream