Update with r577 (Metadata update)