Initial check in of Clarity Client 2.18 to GitHub.