Merge "Improve formatting of doc comments and add more details." into main