Merge "Flag the remaining archive APIs." into main