OxPoints / merge shapes from multiple OSM elements

Pending what might be done upstream?