Merge "Add final editing metrics" into main