Update version string to 2.5.1-pre.1
updates docs from internal review
merges master into docs