Merge "Remove the replacing surface code" into devel/master