Updated XML serialization of "annotation".
Updates for schema adjustments.
Updates for schema adjustments.
Updates for schema adjustments.
Merge origin/master