Follow 1.2 specs more precisely.
Merge branch 'pr/82'