subspace-core-primitives
refactoring (part 2)
#3088
Merged
subspace-core-primitives
refactoring (part 2)
#3088