Initial commit.
Subset of v1.6
Update to v1.7-draft.1