Mergeroot-surface-contractintomain

This branch has no changes from main