combine: distribute_notes again (PR69567, PR64682)