Merge "assign labels to merged_txt modules with defs" into main