Merge branch 'sb/object-store'