Merging changes to protootype survey