Merge pull request #87 from tstrachota/fields

Fixes #4231 and	#4384 - output adapter issues
Fixes #4472 - i18n support