Creating a link to XWIKI-15614 as it's also related how we save documents, see in particular https://jira.xwiki.org/browse/XWIKI-20890?focusedId=117389&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-117389