- Make storage easier. (cherry picked from commit ed84a4732d7dd3ce6b2c22f30553ab5c59f85dbb)
(cherry picked from commit 699333ca06526d747a7eb4a188e896de81e9f014)