[DO NOT MERGE] Surface owner storage capabilities