Merge remote-tracking branch 'upstream/attachment-meta' into blurhash