Update version to v017
Merge branch 'troy'