Pick up the latest changes from legal-docs