Merge branch 'iss-901-essays'
Merge branch 'master' into integration
annotations minor improvements

write all non-null properties (including false)
order by start and end
Merge branch 'master' into integration