Update with r571 (Metadata update)