Merge "Fix regression, show internal storage option..." into nyc-dev