Change serialization of submission status to avoid possible inconsistencies
Merge branch 'servertest'