Merge remote-tracking branch 'origin/development' into development
* Added option to ignore control fields in subject headings