ConstructFrom/ConstructFromMany with SurroundConstruct
Merge branch 'SurroundConstruct'