Fix content id (issue #4810)
Merge remote-tracking branch 'origin/develop' into develop