Merge "Fix modes summary" into main