Merge "Update the URI data" into main