Added commarch assignment.
Merge remote-tracking branch 'origin/pr/136'