Merge remote-tracking branch 'openstreetmap/pull/1030' into next