Merge "Fix ongoing autogenerated summaries" into tm-dev