uniproc model, no enum co version.
Merge branch 'master' into initwrite