Fix assertion.
Merge branch 'master' into v2
Add v2 spec.