Merge remote-tracking branch 'origin/t3/image-picture-id' into t3/page-add-copies-content