content field handling improved.
Merge commit 'fe74408ac6a7b5ec21f0a18dab89e862549638fa' into HEAD