Merge "Add internal option [DEFAULT]shared_storage to ocata"