Merge branch 'sb/object-store-grafts' into sb/object-store-lookup