Merge version70 back in to paramsets