Merge branch 'fix-content-answer-persistence' into 'master'

Fix persistance related bugs for contents and answers

See merge request !150
7 jobs for master in 2 minutes and 35 seconds (queued for 1 second)