Merge "[Tempest] Handle errored shares correctly using recreation logic"