WIP: Feature surface handling

Closed Mark OLESEN requested to merge feature-surface-handling into develop

Merge request reports