Merge "Change surface type in tc" into devel/master