Merge "s/etag/version/"