Re-apply !1064: Isolate sub-slot data from the parent slot
This reverts merge request !1079 (merged), which reverted !1064 (merged), so is re-applying !1064 (merged)
This reverts merge request !1079 (merged), which reverted !1064 (merged), so is re-applying !1064 (merged)