Merged storage classes from new-ui branch into master.