Merge branch 'master' into develop
case 2947 - Added new field: Area.
case 2947 - Reexported area field.
Merge branch 'case-2947' into develop
Merge remote-tracking branch 'origin/develop'