Merge "Improve editing metrics APIs and documentation" into main