Upgrade layout-fetcher