Merge branch 'fix-content-state' into 'master'

Fix state updating of single Contents for /v2

See merge request !109
6 jobs for master in 1 minute and 45 seconds (queued for 3 seconds)