Merge branch 'content-entity' into ping-feature