osm-v31-merge-8