Fixed missing external_id field in person form
Merge remote-tracking branch 'origin/development' into development