Merge branch 'sb/object-store-replace'