Merge changes from surfaces datatypes